Merge from trunk
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 9 Sep 2011 04:24:15 +0000 (21:24 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 9 Sep 2011 04:24:15 +0000 (21:24 -0700)

Trivial merge